don't go into the extensions subdirectory on Windows removed the

2007-01-06  Michael Schumacher  <schumaml@cvs.gnome.org>

	* Makefile.am: don't go into the extensions subdirectory on
	Windows
	* extensions/Makefile.am: removed the win32_libs definition, using
	libgw32c does more harm than good, apparently

svn path=/trunk/; revision=192

diff --git a/ChangeLog b/ChangeLog
index 1ab279df8369300eb9075a419d49ab01ca2a3d67..16ee3d8557c89e91e47640e2d3f091b01e488d1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-06  Michael Schumacher  <schumaml@cvs.gnome.org>
+
+       * Makefile.am: don't go into the extensions subdirectory on
+       Windows 
+       * extensions/Makefile.am: removed the win32_libs definition, using
+       libgw32c does more harm than good, apparently
+       
 2007-01-06  Michael Schumacher  <schumaml@cvs.gnome.org>
 
        * docs/Makefile.am: added EXEEXT to the tools used in some

diff --git a/Makefile.am b/Makefile.am
index e13ff491bf071bc1201b24142d24f3457b608686..15590d134615388f1ea4e7c63773ec174523aea9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,13 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2
 
+if OS_WIN32
+extensions=
+else
+extensions=extensions
+endif
+
 SUBDIRS = babl         \
-         extensions    \
+         ${extensions} \
          tests         \
          docs
 

diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index aff9ec08f1f61e8673fbdd2c8e60b903c210dbd3..b976f3de5627cafa51b042847701ec1aa87f48bb 100644 (file)
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -2,7 +2,6 @@
 # file babl_extensions
 
 if OS_WIN32
-win32_libs = ../babl/.libs/libbabl.a -lgw32c -liberty -lole32 -luuid -lwsock32
 no_undefined = -no-undefined
 endif
 
@@ -19,7 +18,7 @@ CFLAGS  += -I $(top_srcdir)/babl -I $(top_srcdir)/extensions -fPIC
 
 LDFLAGS += -shared
 
-LDADD    = $(win32_libs) $(no-undefined)
+LDADD    = $(no-undefined)
 
 %.so: %.c
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)